| 
                
               | 
              
                
               | 
              
                @@ -693,6 +693,7 @@ def member_goods_order(request): 
               | 
            
            
            
              | 
                693
               | 
              
                693
               | 
              
                     good_type = request.POST.get('good_type', '')
               | 
            
            
            
              | 
                694
               | 
              
                694
               | 
              
                     page = request.POST.get('page', 1)
               | 
            
            
            
              | 
                695
               | 
              
                695
               | 
              
                     num = request.POST.get('num', 20)
               | 
            
            
            
              | 
                
               | 
              
                696
               | 
              
                +    order_status = int(request.POST.get('order_status', 0))
               | 
            
            
            
              | 
                696
               | 
              
                697
               | 
              
                  
               | 
            
            
            
              | 
                697
               | 
              
                698
               | 
              
                     if brand_id != settings.KODO_DEFAULT_BRAND_ID: 
               | 
            
            
            
              | 
                698
               | 
              
                699
               | 
              
                         return response(ProductBrandStatusCode.BRAND_NOT_MATCH) 
               | 
            
            
            
            
            
              | 
                
               | 
              
                
               | 
              
                @@ -706,6 +707,12 @@ def member_goods_order(request): 
               | 
            
            
            
              | 
                706
               | 
              
                707
               | 
              
                  
               | 
            
            
            
              | 
                707
               | 
              
                708
               | 
              
                     if good_type: 
               | 
            
            
            
              | 
                708
               | 
              
                709
               | 
              
                         orders = orders.filter(good_type=good_type) 
               | 
            
            
            
              | 
                
               | 
              
                710
               | 
              
                +     
               | 
            
            
            
              | 
                
               | 
              
                711
               | 
              
                +    # 未发货,即快递单号为空 
               | 
            
            
            
              | 
                
               | 
              
                712
               | 
              
                +    if order_status == 1: 
               | 
            
            
            
              | 
                
               | 
              
                713
               | 
              
                +        orders = orders.filter(tracking_number__isnull=True) 
               | 
            
            
            
              | 
                
               | 
              
                714
               | 
              
                +    elif order_status == 2: 
               | 
            
            
            
              | 
                
               | 
              
                715
               | 
              
                +        orders = orders.filter(tracking_number__isnull=False).exclude(tracking_number='') 
               | 
            
            
            
              | 
                709
               | 
              
                716
               | 
              
                  
               | 
            
            
            
              | 
                710
               | 
              
                717
               | 
              
                     count = orders.count() 
               | 
            
            
            
              | 
                711
               | 
              
                718
               | 
              
                     orders, left = pagination(orders, page, num) 
               |